From: Joakim Verona <joakim@verona.se>
Date: Sat, 31 Jan 2015 23:37:46 +0000 (+0100)
Subject: Merge branch 'master' into xwidget
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~23^2~3383
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=69815dfe3704f8a8c733843f1fd04546cbb0f4d0;p=emacs.git

Merge branch 'master' into xwidget
---

69815dfe3704f8a8c733843f1fd04546cbb0f4d0